From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sun, 9 Jul 2017 10:31:42 +0000 (+0300)
Subject: Fix tests
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~8^2~10^2~7
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=cce5b3d55ece16f5a75c02761c25eb0ebcb5b35f;p=cargo.git

Fix tests
---

diff --git a/tests/git.rs b/tests/git.rs
index b58cef8eb..c6fae519d 100644
--- a/tests/git.rs
+++ b/tests/git.rs
@@ -1341,8 +1341,8 @@ fn git_dep_build_cmd() {
             build = "build.rs"
 
             [lib]
-
             name = "bar"
+            path = "src/bar.rs"
         "#)
         .file("bar/src/bar.rs.in", r#"
             pub fn gimme() -> i32 { 0 }
diff --git a/tests/path.rs b/tests/path.rs
index 16335e216..bca1707fe 100644
--- a/tests/path.rs
+++ b/tests/path.rs
@@ -535,12 +535,9 @@ fn error_message_for_missing_manifest() {
             [dependencies.bar]
 
             path = "src/bar"
-
-            [lib]
-
-            name = "foo"
         "#)
-       .file("src/bar/not-a-manifest", "");
+        .file("src/lib.rs", "")
+        .file("src/bar/not-a-manifest", "");
 
     assert_that(p.cargo_process("build"),
                 execs().with_status(101)
@@ -704,8 +701,8 @@ fn path_dep_build_cmd() {
             build = "build.rs"
 
             [lib]
-
             name = "bar"
+            path = "src/bar.rs"
         "#)
         .file("bar/build.rs", r#"
             use std::fs;
diff --git a/tests/plugins.rs b/tests/plugins.rs
index bcc2f7aff..8ee6ce8df 100644
--- a/tests/plugins.rs
+++ b/tests/plugins.rs
@@ -251,7 +251,6 @@ fn native_plugin_dependency_with_custom_ar_linker() {
             authors = []
 
             [lib]
-            name = "foo"
             plugin = true
         "#)
         .file("src/lib.rs", "");
@@ -263,13 +262,10 @@ fn native_plugin_dependency_with_custom_ar_linker() {
             version = "0.0.1"
             authors = []
 
-            [lib]
-            name = "bar"
-
             [dependencies.foo]
             path = "../foo"
         "#)
-        .file("src/lib", "")
+        .file("src/lib.rs", "")
         .file(".cargo/config", &format!(r#"
             [target.{}]
             ar = "nonexistent-ar"